projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8bcd6b 7d2c65d)
bitkeeper revision 1.1159.187.16 (41a61a44Xij1fE3MnjvIv-xHwoKOZg)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 17:45:40 +0000 (17:45 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 25 Nov 2004 17:45:40 +0000 (17:45 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-2.0-testing.bk

1  2 
xen/arch/x86/memory.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/memory.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.